Merge "resourceloader: Remove redundant getModifiedTime implementations"

diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index f695b11..eb06a69 100644 (file)
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -409,10 +409,7 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
                $files = array_values( array_unique( $files ) );
                $filesMtime = max( array_map( array( __CLASS__, 'safeFilemtime' ), $files ) );
 
-               return max(
-                       $filesMtime,
-                       $this->getDefinitionMtime( $context )
-               );
+               return $filesMtime;
        }
 
        /**

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index 1239453..ebaf366 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -62,14 +62,6 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
                );
        }
 
-       /**
-        * @param ResourceLoaderContext $context
-        * @return int UNIX timestamp
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return max( 1, $this->getHashMtime( $context ) );
-       }
-
        /**
         * @param ResourceLoaderContext $context
         * @return string Hash

diff --git a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
index 55b1f4b..3111050 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageNamesModule.php
@@ -64,14 +64,6 @@ class ResourceLoaderLanguageNamesModule extends ResourceLoaderModule {
                return array( 'mediawiki.language.init' );
        }
 
-       /**
-        * @param ResourceLoaderContext $context
-        * @return int UNIX timestamp
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return max( 1, $this->getHashMtime( $context ) );
-       }
-
        /**
         * @param ResourceLoaderContext $context
         * @return string Hash

diff --git a/includes/resourceloader/ResourceLoaderSkinModule.php b/includes/resourceloader/ResourceLoaderSkinModule.php
index 3ba63e6..980b7fe 100644 (file)
--- a/includes/resourceloader/ResourceLoaderSkinModule.php
+++ b/includes/resourceloader/ResourceLoaderSkinModule.php
@@ -71,15 +71,6 @@ class ResourceLoaderSkinModule extends ResourceLoaderFileModule {
                return false;
        }
 
-       /**
-        * @param $context ResourceLoaderContext
-        * @return int|mixed
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               $parentMTime = parent::getModifiedTime( $context );
-               return max( $parentMTime, $this->getHashMtime( $context ) );
-       }
-
        /**
         * @param $context ResourceLoaderContext
         * @return string: Hash

diff --git a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
index bbc59ac..5eb4e3a 100644 (file)
--- a/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
+++ b/includes/resourceloader/ResourceLoaderSpecialCharacterDataModule.php
@@ -53,14 +53,6 @@ class ResourceLoaderSpecialCharacterDataModule extends ResourceLoaderModule {
                );
        }
 
-       /**
-        * @param ResourceLoaderContext $context
-        * @return int UNIX timestamp
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return static::safeFilemtime( $this->path );
-       }
-
        /**
         * @param ResourceLoaderContext $context
         * @return string Hash

diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 472ceb2..d0f7d44 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -27,25 +27,14 @@
  */
 class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 
-       /* Protected Members */
-
-       protected $modifiedTime = array();
-
        protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
 
-       /* Methods */
-
        /**
         * @param ResourceLoaderContext $context
         * @return array|int|mixed
         */
        public function getModifiedTime( ResourceLoaderContext $context ) {
-               $hash = $context->getHash();
-               if ( !isset( $this->modifiedTime[$hash] ) ) {
-                       $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
-               }
-
-               return $this->modifiedTime[$hash];
+               return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
        }
 
        /**

diff --git a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
index 5f4bc16..2fd35ad 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserDefaultsModule.php
@@ -40,14 +40,6 @@ class ResourceLoaderUserDefaultsModule extends ResourceLoaderModule {
                return md5( serialize( User::getDefaultOptions() ) );
        }
 
-       /**
-        * @param ResourceLoaderContext $context
-        * @return int
-        */
-       public function getModifiedTime( ResourceLoaderContext $context ) {
-               return $this->getHashMtime( $context );
-       }
-
        /**
         * @param ResourceLoaderContext $context
         * @return string

diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 84c1906..4ed1b87 100644 (file)
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -27,16 +27,10 @@
  */
 class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
 
-       /* Protected Members */
-
-       protected $modifiedTime = array();
-
        protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
 
        protected $targets = array( 'desktop', 'mobile' );
 
-       /* Methods */
-
        /**
         * @return array List of module names as strings
         */
@@ -49,12 +43,7 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
         * @return int
         */
        public function getModifiedTime( ResourceLoaderContext $context ) {
-               $hash = $context->getHash();
-               if ( !isset( $this->modifiedTime[$hash] ) ) {
-                       $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
-               }
-
-               return $this->modifiedTime[$hash];
+               return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
        }
 
        /**

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 74ad774..86d59a1 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -229,8 +229,7 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
                }
                $modifiedTime = max(
                        $modifiedTime,
-                       $this->getMsgBlobMtime( $context->getLanguage() ),
-                       $this->getDefinitionMtime( $context )
+                       $this->getMsgBlobMtime( $context->getLanguage() )
                );
                return $modifiedTime;
        }